From f1f809a06b3d98eca14760ef245cecb78ceeef23 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 1 Aug 2012 08:41:17 +0000
Subject: [PATCH] fix-system-lpsolve-build

Gbp-Pq: Name fix-system-lpsolve-build.diff
---
 configure.in             | Bin 344630 -> 344681 bytes
 sccomp/Library_solver.mk |   6 ++++++
 solenv/inc/libs.mk       |   6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/configure.in b/configure.in
index 90ce592beccfb87c6792309bb59ba48a7dc18b5c..ad16f8474ae62b2e7912492f07cd8acdf2deaec1 100644
GIT binary patch
delta 71
zcmdniBKopLw4sHug=q_O^c242{G7zx6deT!J>6ppbC!s%kA7)!k$z5Ql73D>aehu&
XYOLn;jSb8O?N6pKZ+|j{C1@=GyoVct

delta 40
wcmaFaBD$?bw4sHug=q_O^pxo}Q<%f2`}Q!iPq*u4(ry=@%Di2CDofB>06x|ZrvLx|

diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index ba9493a4d68..6c08291c366 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -49,7 +49,13 @@ $(eval $(call gb_Library_add_linked_libs,solver,\
 	$(gb_STDLIBS) \
 ))
 
+ifeq ($(SYSTEM_LPSOLVE),YES)
+$(eval $(call gb_Library_add_ldflags,solver, \
+	/usr/lib/lp_solve/liblpsolve55.so -Wl$(COMMA)-rpath=/usr/lib/lp_solve \
+))
+else
 $(eval $(call gb_Library_use_external,solver,lpsolve55))
+endif
 
 $(eval $(call gb_Library_add_exception_objects,solver,\
 	sccomp/source/solver/solver \
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 12db54a70e1..45d61c3a8ff 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -310,7 +310,13 @@ MYTHESLIB=$(MYTHES_LIBS)
 MYTHESLIB=-lmythes-1.2
 .ENDIF
 PYUNOLIB=-lpyuno
+.IF "$(SYSTEM_LPSOLVE)" == "YES"
+# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from
+# /usr/lib gets picked and we get a static link...
+LPSOLVELIB = /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve
+.ELSE
 LPSOLVELIB=-llpsolve55
+.ENDIF
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest
-- 
2.30.2